don't cast a PIXTEXT cell to a PIXMAP cell (fixes crash when using PIXTEXT

2001-10-22  jacob berkman  <jacob@ximian.com>

	* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
	a PIXMAP cell (fixes crash when using PIXTEXT cells)

diff --git a/ChangeLog b/ChangeLog
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ef15b71a0c20ab6a67c88287167ab0891ae47dc2..6dada401aebbb522bb9c0bab10d23bd27a516866 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-22  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
+       a PIXMAP cell (fixes crash when using PIXTEXT cells)
+
 Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 4d358390369eae2c332221d5ae977b9a98393b8f..0e1c467e0e430245a87c2c9989f391a938ee692d 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2618,6 +2618,11 @@ cell_size_request (GtkCList       *clist,
   switch (clist_row->cell[column].type)
     {
     case GTK_CELL_PIXTEXT:
+      gdk_window_get_size (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap,
+                          &width, &height);
+      requisition->width += width;
+      requisition->height = MAX (requisition->height, height);      
+      break;
     case GTK_CELL_PIXMAP:
       gdk_window_get_size (GTK_CELL_PIXMAP (clist_row->cell[column])->pixmap,
                           &width, &height);